Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 00:26:43 +0000 (17:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 4 May 2011 00:26:43 +0000 (17:26 -0700)
commite224563c2f5b9768d3059267cfcbf7fffc554c58
tree54d3b60cfcb31d4bc5dfe70a52e12f1990b0167a
parentb4533d74a554683aa05d19e4d244e800262d6382
parent63b48cebe0aa16dc701d11a162109b9bba5c2765
Merge from mainline.
src/ChangeLog